(byte-optimize-form-code-walker):

Treat save-current-buffer like save-excursion.

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 80f3bedc0ef7d57e0386a80b0153b4c59910f41d..ef2880c7d9b1aae73f93b5c7c6192e09f8ba10f6 100644 (file)
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -423,7 +423,7 @@
               (cons (byte-optimize-form (nth 2 form) for-effect)
                     (byte-optimize-body (cdr (cdr (cdr form))) t)))))
          
-         ((memq fn '(save-excursion save-restriction))
+         ((memq fn '(save-excursion save-restriction save-current-buffer))
           ;; those subrs which have an implicit progn; it's not quite good
           ;; enough to treat these like normal function calls.
           ;; This can turn (save-excursion ...) into (save-excursion) which